data: Remove unused, commented and obsolete Conflicts lines

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895

diff --git a/data/org.gnome.Shell-wayland.service.in b/data/org.gnome.Shell-wayland.service.in
index ec79cd55cd213b7e9d94f040530353a2f845c152..98c8aa123a7fcf5c2af0039c970270697964eb3b 100644 (file)
--- a/data/org.gnome.Shell-wayland.service.in
+++ b/data/org.gnome.Shell-wayland.service.in
@@ -13,9 +13,6 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
-# The units already conflict because they use the same BusName
-#Conflicts=gnome-shell-x11.service
-
 [Service]
 Type=notify
 ExecStart=@bindir@/gnome-shell

diff --git a/data/org.gnome.Shell-x11.service.in b/data/org.gnome.Shell-x11.service.in
index 5e85f486c2909b6e507c562f45948a06345d0565..f3c6b64773fa39d6e324f0552413eb57870d1da3 100644 (file)
--- a/data/org.gnome.Shell-x11.service.in
+++ b/data/org.gnome.Shell-x11.service.in
@@ -13,9 +13,6 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
-# The units already conflict because they use the same BusName
-#Conflicts=gnome-shell-wayland.service
-
 # Limit startup frequency more than the default
 StartLimitIntervalSec=15s
 StartLimitBurst=3